From: Kenichi Handa <handa@m17n.org>
Date: Wed, 8 Apr 2009 01:30:55 +0000 (+0000)
Subject: (ftfont_text_extents): Fix calculation of metrics->descent.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~937
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=753af93b168c6458c89100d6d9f2ff8eddc5573e;p=emacs.git

(ftfont_text_extents): Fix calculation of metrics->descent.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index f515856bcba..0be985e30f2 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1255,7 +1255,7 @@ ftfont_text_extents (font, code, nglyphs, metrics)
 		  metrics->lbearing = m->horiBearingX >> 6;
 		  metrics->rbearing = (m->horiBearingX + m->width) >> 6;
 		  metrics->ascent = m->horiBearingY >> 6;
-		  metrics->descent = (m->horiBearingY + m->height) >> 6;
+		  metrics->descent = (m->height - m->horiBearingY) >> 6;
 		}
 	      first = 0;
 	    }
@@ -1269,8 +1269,8 @@ ftfont_text_extents (font, code, nglyphs, metrics)
 		  = width + ((m->horiBearingX + m->width) >> 6);
 	      if (metrics->ascent < (m->horiBearingY >> 6))
 		metrics->ascent = m->horiBearingY >> 6;
-	      if (metrics->descent > ((m->horiBearingY + m->height) >> 6))
-		metrics->descent = (m->horiBearingY + m->height) >> 6;
+	      if (metrics->descent > ((m->height - m->horiBearingY) >> 6))
+		metrics->descent = (m->height - m->horiBearingY) >> 6;
 	    }
 	  width += m->horiAdvance >> 6;
 	}